xentrace bug fix: data format of hvmtrace is changed.

Signed-off-by: Disheng Su <disheng.su@intel.com>

diff --git a/tools/xentrace/formats b/tools/xentrace/formats
index 617bf284ed56b23de9acbd896efe3d18d2c1ede0..3028ec0b0f260d043cee75e7cce9bd71c25c507f 100644 (file)
--- a/tools/xentrace/formats
+++ b/tools/xentrace/formats
@@ -19,8 +19,8 @@
 0x0002f00d  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  dom_timer_fn
 
 0x00081001  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  VMENTRY     [ dom:vcpu = 0x%(1)08x ]
-0x00081002  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  VMEXIT      [ dom:vcpu = 0x%(1)08x, rIP  = 0x%(2)08x, exitcode = 0x%(3)08x ]
-0x00082001  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN      [ dom:vcpu = 0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
+0x00081002  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  VMEXIT      [ dom:vcpu = 0x%(1)08x, exitcode = 0x%(2)08x, rIP  = 0x%(3)08x ]
+0x00082001  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN      [ dom:vcpu = 0x%(1)08x, errorcode = 0x%(2)02x, virt = 0x%(3)08x ]
 0x00082002  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_INJECT   [ dom:vcpu = 0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
 0x00082003  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  INJ_EXC     [ dom:vcpu = 0x%(1)08x, vector = 0x%(2)02x, errorcode = 0x%(3)04x ]
 0x00082004  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  INJ_VIRQ    [ dom:vcpu = 0x%(1)08x, vector = 0x%(2)02x, fake = %(3)d ]
@@ -45,4 +45,4 @@
 0x00082017  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  MMIO_ASSIST [ dom:vcpu = 0x%(1)08x, data = 0x%(2)04x ]
 0x00082018  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  CLTS        [ dom:vcpu = 0x%(1)08x ]
 0x00082019  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  LMSW        [ dom:vcpu = 0x%(1)08x, value = 0x%(2)08x ]
-0x00082020  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN64    [ dom:vcpu = 0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
+0x00082020  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN64    [ dom:vcpu = 0x%(1)08x, errorcode = 0x%(2)02x, virt = 0x%(3)08x ]

diff --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format
index 20fa7718ce2a465f7273c6643671ce9aa1b5a93f..6399217bb6516322ecda728abba344520e5a5df9 100644 (file)
--- a/tools/xentrace/xentrace_format
+++ b/tools/xentrace/xentrace_format
@@ -134,7 +134,7 @@ while not interrupted:
             line = sys.stdin.read(struct.calcsize(D1REC))
             if not line:
                 break
-            (d1) = struct.unpack(D1REC, line)
+            d1 = struct.unpack(D1REC, line)[0]
         if n_data == 2:
             line = sys.stdin.read(struct.calcsize(D2REC))
             if not line: